From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat, 8 Mar 2014 18:54:09 +0000 (+0100)
Subject: NMConnectionSection: don't remove connections that were never added
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2659
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=522f3bf171dbf3e3378bf99b8c7500c63f62bd1d;p=gnome-shell.git

NMConnectionSection: don't remove connections that were never added

NMApplet will call removeConnection() unconditionally on all sections,
including those that had nothing to do with the connection in the first
place.

Fixes:

Gjs-WARNING **: JS ERROR: TypeError: this._connectionItems.get(...) is undefined
NMConnectionSection<.removeConnection@resource:///org/gnome/shell/ui/status/network.js:323
wrapper@resource:///org/gnome/gjs/modules/lang.js:169
NMApplet<._connectionRemoved@resource:///org/gnome/shell/ui/status/network.js:1885
wrapper@resource:///org/gnome/gjs/modules/lang.js:169

https://bugzilla.gnome.org/show_bug.cgi?id=725958
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index b159e3cf8..ce6b004de 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -293,8 +293,13 @@ const NMConnectionSection = new Lang.Class({
     },
 
     removeConnection: function(connection) {
-        this._connectionItems.get(connection.get_uuid()).destroy();
-        this._connectionItems.delete(connection.get_uuid());
+        let uuid = connection.get_uuid();
+        let item = this._connectionItems.get(uuid);
+        if (item == undefined)
+            return;
+
+        item.destroy();
+        this._connectionItems.delete(uuid);
 
         let pos = this._connections.indexOf(connection);
         this._connections.splice(pos, 1);